merge with xen-ia64-unstable.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 18 Mar 2006 09:59:11 +0000 (10:59 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 18 Mar 2006 09:59:11 +0000 (10:59 +0100)

Trivial merge